unlockDialog: Don't destroy on cancel

Otherwise there will be no way to recover it in the future. Also
remove an else condition that assumed the dialog would destroy
itself on cancel.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 918df054360ef58e661a472ab10d6d7a81a93939..3d66a273742016aab60fa8bcb76e0d4f1e181c37 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -191,8 +191,6 @@ var ScreenShield = class {
             // on its own, so ensure it stays on lock screen
             // instead
             this._lockScreenGroup.grab_key_focus();
-        } else {
-            this._dialog = null;
         }
     }
 

diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index ff2787ac4db27b1838f44545f59bf083c8c9b95a..7b9b0e723b7fddd45818ddac107d2c5b2c0cc82c 100644 (file)
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -499,8 +499,6 @@ var UnlockDialog = GObject.registerClass({
 
     cancel() {
         this._authPrompt.cancel();
-
-        this.destroy();
     }
 
     addCharacter(unichar) {